Revert last change; it causes problems for pastes from other applications;

Sat Mar 13 10:34:03 2004  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtktextview.c gtk/gtktextbuffer.c: Revert last change;
        it causes problems for pastes from other applications; see
        comments in bugzilla for #81880.

diff --git a/ChangeLog b/ChangeLog
index b69d05e491a47d4f7b5b6c97062bf44ab6836f23..6fe778221e08a3360dc945b92d45a7fd94ae0794 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Mar 13 10:34:03 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c gtk/gtktextbuffer.c: Revert last change;
+       it causes problems for pastes from other applications; see
+       comments in bugzilla for #81880.
+
 Sat Mar 13 02:55:51 2004  Matthias Clasen  <maclas@gmx.de>
 
        Fix middle button pasting in the TextView  (#81880, reported

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b69d05e491a47d4f7b5b6c97062bf44ab6836f23..6fe778221e08a3360dc945b92d45a7fd94ae0794 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sat Mar 13 10:34:03 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c gtk/gtktextbuffer.c: Revert last change;
+       it causes problems for pastes from other applications; see
+       comments in bugzilla for #81880.
+
 Sat Mar 13 02:55:51 2004  Matthias Clasen  <maclas@gmx.de>
 
        Fix middle button pasting in the TextView  (#81880, reported

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b69d05e491a47d4f7b5b6c97062bf44ab6836f23..6fe778221e08a3360dc945b92d45a7fd94ae0794 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sat Mar 13 10:34:03 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c gtk/gtktextbuffer.c: Revert last change;
+       it causes problems for pastes from other applications; see
+       comments in bugzilla for #81880.
+
 Sat Mar 13 02:55:51 2004  Matthias Clasen  <maclas@gmx.de>
 
        Fix middle button pasting in the TextView  (#81880, reported

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b69d05e491a47d4f7b5b6c97062bf44ab6836f23..6fe778221e08a3360dc945b92d45a7fd94ae0794 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sat Mar 13 10:34:03 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c gtk/gtktextbuffer.c: Revert last change;
+       it causes problems for pastes from other applications; see
+       comments in bugzilla for #81880.
+
 Sat Mar 13 02:55:51 2004  Matthias Clasen  <maclas@gmx.de>
 
        Fix middle button pasting in the TextView  (#81880, reported

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b69d05e491a47d4f7b5b6c97062bf44ab6836f23..6fe778221e08a3360dc945b92d45a7fd94ae0794 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sat Mar 13 10:34:03 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c gtk/gtktextbuffer.c: Revert last change;
+       it causes problems for pastes from other applications; see
+       comments in bugzilla for #81880.
+
 Sat Mar 13 02:55:51 2004  Matthias Clasen  <maclas@gmx.de>
 
        Fix middle button pasting in the TextView  (#81880, reported

diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 0a9f9474510d23b95664160983d7609edcfd8e96..b327d50f2f2ba2c8c24e88406a32610aff2e3716 100644 (file)
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -2936,8 +2936,6 @@ pre_paste_prep (ClipboardRequest *request_data,
       if (gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
         *insert_point = start;
     }
-
-  gtk_text_buffer_move_mark_by_name (buffer, "insert", insert_point);
 }
 
 static void

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index a501ecd855169c28c2f711ce4e93508bcd3ad505..df8d8778001cc4a80f2c71d8e436db82d1489f3b 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -3931,7 +3931,6 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event)
       else if (event->button == 2)
         {
           GtkTextIter iter;
-          GtkTextMark *mark;
 
           gtk_text_layout_get_iter_at_pixel (text_view->layout,
                                              &iter,
@@ -3939,21 +3938,9 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event)
                                              event->y + text_view->yoffset);
 
           gtk_text_buffer_paste_clipboard (get_buffer (text_view),
-                                           gtk_widget_get_clipboard (widget, GDK_SELECTION_PRIMARY),
-                                           &iter,
-                                           text_view->editable);
-
-          mark = gtk_text_buffer_get_mark (get_buffer (text_view), "insert");
-          gtk_text_buffer_get_iter_at_mark (get_buffer (text_view),
-                                            &iter,
-                                            mark);
-
-          gtk_text_buffer_place_cursor (get_buffer (text_view), &iter);
-
-          DV(g_print (G_STRLOC": scrolling onscreen\n"));
-          gtk_text_view_scroll_mark_onscreen (text_view,
-                                              gtk_text_buffer_get_mark (get_buffer (text_view),
-                                                                        "insert"));
+                                          gtk_widget_get_clipboard (widget, GDK_SELECTION_PRIMARY),
+                                          &iter,
+                                          text_view->editable);
           return TRUE;
         }
       else if (event->button == 3)